Autogenerated HTML docs for v1.5.0.4-404-gdbb2
diff --git a/git-config.html b/git-config.html index cbcf4d6..ba68021 100644 --- a/git-config.html +++ b/git-config.html
@@ -920,6 +920,10 @@ <tt>git fetch</tt>) to lookup the default branch for merging. Without this option, <tt>git pull</tt> defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. + If you wish to setup <tt>git pull</tt> so that it merges into <name> from + another branch in the local repository, you can point + branch.<name>.merge to the desired branch, and use the special setting + <tt>.</tt> (a period) for branch.<name>.remote. </p> </dd> <dt> @@ -1519,7 +1523,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 15-Mar-2007 07:12:11 UTC +Last updated 16-Mar-2007 10:20:49 UTC </div> </div> </body>
